Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 15 Jan 2010 14:21:59 +0000 (14:21 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 15 Jan 2010 14:21:59 +0000 (14:21 +0000)
commita4ab91f36e8424379dcb3241f07a1338e744df8e
treef5f9c290f57acd42c21ab60306cc0133f754ef24
parentae5c31429d3eaef18fb18280632be8d0beb65d6c
parentaa0c95604d2e1726c19369870d519abc1b59416a
Merge from mainline.